Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 2 Apr 2010 11:36:10 +0000 (11:36 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 2 Apr 2010 11:36:10 +0000 (11:36 +0000)

Trivial merge